Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 19:31:04 +0000 (11:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 19:31:04 +0000 (11:31 -0800)

Trivial merge